Use "position" instead of "pos".

	* tests/merge-2.ui: Use "position" instead of "pos".

	* gtk/gtkuimanager.c (start_element_handler): No need
	to be terse: Change the name of the "pos" attribute
	to "position".

	* gtk/tmpl/gtkuimanager.sgml: Change the name of the "pos"
	attribute to "position".

diff --git a/ChangeLog b/ChangeLog
index 9b7f1eb5e4736baff8bb479238bfffa29cee0b1a..a6696ba2df2f156c1d4fc0f44242f300be4cf4aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2003-09-04  Matthias Clasen  <maclas@gmx.de>
+
+       * tests/merge-2.ui: Use "position" instead of "pos".
+
+       * gtk/gtkuimanager.c (start_element_handler): No need 
+       to be terse: Change the name of the "pos" attribute
+       to "position".
+
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c: Un-prefix GtkUIManagerNodeType and 
        GtkUIManagerNode to shorten the names and to make the
        GTK_UI_MANAGER_<TYPE> names available for a public enum.
-       
+
        * gtk/gtkactiongroup.c:
        * gtk/gtkuimanager.c: Various doc tweaks.       
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9b7f1eb5e4736baff8bb479238bfffa29cee0b1a..a6696ba2df2f156c1d4fc0f44242f300be4cf4aa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,9 +1,17 @@
+2003-09-04  Matthias Clasen  <maclas@gmx.de>
+
+       * tests/merge-2.ui: Use "position" instead of "pos".
+
+       * gtk/gtkuimanager.c (start_element_handler): No need 
+       to be terse: Change the name of the "pos" attribute
+       to "position".
+
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c: Un-prefix GtkUIManagerNodeType and 
        GtkUIManagerNode to shorten the names and to make the
        GTK_UI_MANAGER_<TYPE> names available for a public enum.
-       
+
        * gtk/gtkactiongroup.c:
        * gtk/gtkuimanager.c: Various doc tweaks.       
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9b7f1eb5e4736baff8bb479238bfffa29cee0b1a..a6696ba2df2f156c1d4fc0f44242f300be4cf4aa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,9 +1,17 @@
+2003-09-04  Matthias Clasen  <maclas@gmx.de>
+
+       * tests/merge-2.ui: Use "position" instead of "pos".
+
+       * gtk/gtkuimanager.c (start_element_handler): No need 
+       to be terse: Change the name of the "pos" attribute
+       to "position".
+
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c: Un-prefix GtkUIManagerNodeType and 
        GtkUIManagerNode to shorten the names and to make the
        GTK_UI_MANAGER_<TYPE> names available for a public enum.
-       
+
        * gtk/gtkactiongroup.c:
        * gtk/gtkuimanager.c: Various doc tweaks.       
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9b7f1eb5e4736baff8bb479238bfffa29cee0b1a..a6696ba2df2f156c1d4fc0f44242f300be4cf4aa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,9 +1,17 @@
+2003-09-04  Matthias Clasen  <maclas@gmx.de>
+
+       * tests/merge-2.ui: Use "position" instead of "pos".
+
+       * gtk/gtkuimanager.c (start_element_handler): No need 
+       to be terse: Change the name of the "pos" attribute
+       to "position".
+
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c: Un-prefix GtkUIManagerNodeType and 
        GtkUIManagerNode to shorten the names and to make the
        GTK_UI_MANAGER_<TYPE> names available for a public enum.
-       
+
        * gtk/gtkactiongroup.c:
        * gtk/gtkuimanager.c: Various doc tweaks.       
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9b7f1eb5e4736baff8bb479238bfffa29cee0b1a..a6696ba2df2f156c1d4fc0f44242f300be4cf4aa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,9 +1,17 @@
+2003-09-04  Matthias Clasen  <maclas@gmx.de>
+
+       * tests/merge-2.ui: Use "position" instead of "pos".
+
+       * gtk/gtkuimanager.c (start_element_handler): No need 
+       to be terse: Change the name of the "pos" attribute
+       to "position".
+
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c: Un-prefix GtkUIManagerNodeType and 
        GtkUIManagerNode to shorten the names and to make the
        GTK_UI_MANAGER_<TYPE> names available for a public enum.
-       
+
        * gtk/gtkactiongroup.c:
        * gtk/gtkuimanager.c: Various doc tweaks.       
 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 42f8b085a5427e4bdb35d0ceec510a6e66755f49..6110c32c7be76c88cde02179318ea6137e0f2bd5 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/tmpl/gtkuimanager.sgml: Change the name of the "pos" 
+       attribute to "position".
+
        * gtk/tmpl/gtkactiongroup.sgml: Doc tweaks.
 
 2003-09-02  Matthias Clasen  <maclas@gmx.de>

diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index 5d845fea1c2c0c2227985d86ce6608c512bc8ee0..012166f84f3f296fea68d43997aa09455048c4d0 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -24,19 +24,19 @@ roughly described by the following DTD.
 <!ELEMENT menuitem     EMPTY >
 <!ELEMENT toolitem     EMPTY >
 <!ELEMENT separator    EMPTY >
-<!ATTLIST menubar      name             #IMPLIED >
-<!ATTLIST toolbar      name             #IMPLIED >
-<!ATTLIST popup        name             #IMPLIED >
-<!ATTLIST placeholder  name             #IMPLIED >
-<!ATTLIST menu         name             #IMPLIED
-                       action           #REQUIRED
-                       pos    (top|bot) #IMPLIED >
-<!ATTLIST menuitem     name             #IMPLIED
-                       action           #REQUIRED
-                       pos    (top|bot) #IMPLIED >
-<!ATTLIST toolitem     name             #IMPLIED
-                       action           #REQUIRED
-                       pos    (top|bot) #IMPLIED >
+<!ATTLIST menubar      name               #IMPLIED >
+<!ATTLIST toolbar      name               #IMPLIED >
+<!ATTLIST popup        name               #IMPLIED >
+<!ATTLIST placeholder  name               #IMPLIED >
+<!ATTLIST menu         name               #IMPLIED
+                       action             #REQUIRED
+                       position (top|bot) #IMPLIED >
+<!ATTLIST menuitem     name               #IMPLIED
+                       action             #REQUIRED
+                       position (top|bot) #IMPLIED >
+<!ATTLIST toolitem     name               #IMPLIED
+                       action             #REQUIRED
+                       position (top|bot) #IMPLIED >
 </programlisting>
 There are some additional restrictions beyond those specified in the
 DTD, e.g. every toolitem must have a toolbar in its anchestry and
@@ -108,7 +108,7 @@ action</para></listitem>
 </variablelist>
 </para>
 <para>
-The pos attribute determines where a constructed widget is positioned
+The "position" attribute determines where a constructed widget is positioned
 wrt. to its siblings in the partially constructed tree. If it is
 "top", the widget is prepended, otherwise it is appended.
 </para>

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index f7583db5b471cc88bc25c45cad19741bcf1b8ba1..65643a3a8280c9a03e79f98b7941a99fcfdd3058 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -797,7 +797,7 @@ start_element_handler (GMarkupParseContext *context,
          action = attribute_values[i];
          action_quark = g_quark_from_string (attribute_values[i]);
        }
-      else if (!strcmp (attribute_names[i], "pos"))
+      else if (!strcmp (attribute_names[i], "position"))
        {
          top = !strcmp (attribute_values[i], "top");
        }

diff --git a/tests/merge-2.ui b/tests/merge-2.ui
index 5cf2f9ce10a30fcbf46d2797b4e80455956f15b1..18fbc607f699d4fc952871ead13697c17e235f3b 100644 (file)
--- a/tests/merge-2.ui
+++ b/tests/merge-2.ui
@@ -2,7 +2,7 @@
 <ui>
   <menubar>
     <menu name="FileMenu" action="FileMenuAction">
-      <menuitem name="New" action="NewAction" pos="top" />
+      <menuitem name="New" action="NewAction" position="top" />
       <separator />
       <menuitem name="Quit" action="QuitAction" />
     </menu>
@@ -17,7 +17,7 @@
     </placeholder>
   </toolbar>
   <popup name="FileMenu" action="FileMenuAction">
-    <menuitem name="New" action="NewAction" pos="top" />
+    <menuitem name="New" action="NewAction" position="top" />
     <menu name="HelpMenu" action="HelpMenuAction">
       <menuitem name="About" action="AboutAction" />
     </menu>